Auto merge of #1397 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 9 Mar 2015 20:51:30 +0000 (20:51 +0000)
committerbors <bors@rust-lang.org>
Mon, 9 Mar 2015 20:51:30 +0000 (20:51 +0000)
Continuation of #1384


Trivial merge